This puts two small fixes in the xm-test suite:

- it turns off verbose mode of the ACM module
- copies the test policy to the policies directory only if the directory
has been created

Signed-off-by: Stefan Berger <stefanb@us.ibm.com>

diff --git a/tools/xm-test/lib/XmTestLib/acm.py b/tools/xm-test/lib/XmTestLib/acm.py
index dd1e67646d21a30ff267792d2bfa8df13c9cca82..a0d8a43c0980e9ab98d44b968671d5715c8f3138 100644 (file)
--- a/tools/xm-test/lib/XmTestLib/acm.py
+++ b/tools/xm-test/lib/XmTestLib/acm.py
@@ -26,7 +26,7 @@ except:
     ACM_LABEL_RESOURCES = False
 
 labeled_resources = {}
-acm_verbose = True
+acm_verbose = False
 
 def isACMEnabled():
     return security.on()

diff --git a/tools/xm-test/runtest.sh b/tools/xm-test/runtest.sh
index 623598cd203d288f6ee224fad3fff6ae82c45f8e..7008972faeeaeb1cbee839f2b512a9fdf32a474e 100755 (executable)
--- a/tools/xm-test/runtest.sh
+++ b/tools/xm-test/runtest.sh
@@ -199,7 +199,10 @@ run=yes
 unsafe=no
 GROUPENTERED=default
 
-cp -f tests/security-acm/xm-test-security_policy.xml /etc/xen/acm-security/policies
+if [ -d /etc/xen/acm-security/policies ]; then
+       cp -f tests/security-acm/xm-test-security_policy.xml \
+             /etc/xen/acm-security/policies
+fi
 
 # Resolve options
 while [ $# -gt 0 ]